From: Peter Michael Green Date: Thu, 28 Sep 2017 01:14:44 +0000 (+0000) Subject: Manual merge of version 3.22.19-1+rpi1 and 3.22.21-1 to produce 3.22.21-1+rpi1 X-Git-Tag: archive/raspbian/3.22.21-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=820358b97896326c91e114dd2330918f106d9d57;p=gtk%2B3.0.git Manual merge of version 3.22.19-1+rpi1 and 3.22.21-1 to produce 3.22.21-1+rpi1 --- 820358b97896326c91e114dd2330918f106d9d57 diff --cc debian/changelog index 470c66e0a6,d5fedc36ab..51d6b8eed7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,26 +1,39 @@@ - gtk+3.0 (3.22.19-1+rpi1) buster-staging; urgency=medium ++gtk+3.0 (3.22.21-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green at Fri, 25 Sep 2015 01:49:45 +0000] + * Disable wayland backend in debian/rules + * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to + Build-Conflicts + * Add symbols file hack for wayland changes. + * Fix clean target. + [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green] + * Disable testsuite. + - -- Raspbian forward porter Mon, 04 Sep 2017 19:26:46 +0000 ++ -- Peter Michael Green Thu, 28 Sep 2017 01:13:20 +0000 ++ + gtk+3.0 (3.22.21-1) unstable; urgency=medium + + * New upstream release. + * Bump to debhelper compat 10. + + Drop dh-autoreconf and autotools-dev build-deps, no longer needed as + debhelper guarantees them now. + * Switch from CDBS to dh. + Only regression is that we don't run --fail-missing on arch:all builds. + * Don't build the docs when not building the -doc packages. Saves some + time on arch-only builds. + * Skip the udeb build when not building the -udeb package. Saves a lot + of time on the arch:all builds. + + -- Emilio Pozuelo Monfort Tue, 12 Sep 2017 00:38:15 +0200 + + gtk+3.0 (3.22.20-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/fix-gtk-menu-sliders.patch: + + Removed, applied upstream. + * Bump Standards-Version to 4.1.0; no changes needed. + + -- Emilio Pozuelo Monfort Sat, 09 Sep 2017 15:11:12 +0200 gtk+3.0 (3.22.19-1) unstable; urgency=medium diff --cc debian/control index 8b7e432806,aea7794ee9..ee6cf7ca7d --- a/debian/control +++ b/debian/control @@@ -45,11 -43,7 +40,10 @@@ Build-Depends: debhelper (>= 10.3~) gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), xauth , - xsltproc, xvfb , +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, diff --cc debian/control.in index b6f013ffaa,5b42752293..60413836b7 --- a/debian/control.in +++ b/debian/control.in @@@ -45,11 -43,7 +40,10 @@@ Build-Depends: debhelper (>= 10.3~) gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), xauth , - xsltproc, xvfb , +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev Build-Depends-Indep: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc, diff --cc debian/patches/series index 5a5681c3e9,7d510f5526..2d0b2e6bc0 --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,5 -6,3 +6,4 @@@ no-accessibility-dump.patch reftest-known-fail.patch gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch - fix-gtk-menu-sliders.patch +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 diff --cc debian/rules index e7a6614f2c,98ed1d0e89..2f22c39e08 --- a/debian/rules +++ b/debian/rules @@@ -156,17 -89,88 +89,91 @@@ debian/%: debian/%.i -e "s#@README@#$(README)#g" \ $@.in > $@ - clean:: debian/control + configure_flags_common = \ + --libdir=/$(LIBDIR) \ + --enable-test-print-backend + + configure_flags_deb = \ + --enable-broadway-backend \ + --enable-x11-backend \ + --enable-gtk-doc \ + --enable-man \ + --enable-shared \ + --enable-introspection \ + --enable-cloudprint \ + --disable-static + + ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) + configure_flags_deb += --enable-colord + else + configure_flags_deb += --disable-colord + endif + -ifeq (linux,$(DEB_HOST_ARCH_OS)) -configure_flags_deb += --enable-wayland-backend -else ++#ifeq (linux,$(DEB_HOST_ARCH_OS)) ++#configure_flags_deb += --enable-wayland-backend ++#else + configure_flags_deb += --disable-wayland-backend -endif ++#endif + + ifeq ($(filter %-doc,$(binaries)),) + configure_flags_deb += --disable-gtk-doc --disable-man + endif + + configure_flags_udeb = \ + --disable-broadway-backend \ + --disable-wayland-backend \ + --enable-x11-backend \ + --disable-introspection \ + --disable-cloudprint \ + --disable-colord \ + --disable-xcomposite \ + --disable-xdamage \ + --disable-xfixes \ + --disable-xrandr + + %: + dh $@ --with gir + + override_dh_clean: debian/control # gross kludge to force control generation with the %.in target touch debian/control.in - rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES)) + rm -f $(call dh_subst_files,$(binaries)) rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install + sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols + rm -rf debian/build debian/install + dh_clean + + # Add dependencies to generate files from the debian/*.in ones + override_dh_auto_build: $(call dh_subst_files,$(binaries)) - pre-build:: + override_dh_autoreconf: + dh_autoreconf "NOCONFIGURE=true ./autogen.sh" + + override_dh_auto_configure: debian/control + sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols + dh_auto_configure \ + --builddirectory=debian/build/deb \ + -- \ + $(configure_flags_common) \ + $(configure_flags_deb) \ + $(NULL) + ifneq ($(filter %-udeb,$(binaries)),) + dh_auto_configure \ + --builddirectory=debian/build/udeb \ + -- \ + $(configure_flags_common) \ + $(configure_flags_udeb) \ + $(NULL) + endif + + override_dh_auto_build: + dh_auto_build --builddirectory=debian/build/deb + ifneq ($(filter %-udeb,$(binaries)),) + dh_auto_build --builddirectory=debian/build/udeb + endif + + override_dh_auto_test: # Mark reftests with known failures as non-fatal touch testsuite/reftests/nonresizable-size.ui.known_fail touch testsuite/reftests/window-show-contents-on-map.ui.known_fail